Autogenerated HTML docs for v1.8.2.1-538-gad776
diff --git a/git-ls-files.html b/git-ls-files.html index 129f400..7ee5327 100644 --- a/git-ls-files.html +++ b/git-ls-files.html
@@ -1098,7 +1098,7 @@ </div></div> <div class="paragraph"><p><em>git ls-files --unmerged</em> and <em>git ls-files --stage</em> can be used to examine detailed information on unmerged paths.</p></div> -<div class="paragraph"><p>For an unmerged path, instead of recording a single mode/SHA1 pair, +<div class="paragraph"><p>For an unmerged path, instead of recording a single mode/SHA-1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the @@ -1164,7 +1164,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
